Add dcn_storage scenario for DCN adoption with Ceph HCI by fultonj · Pull Request #1245 · openstack-k8s-operators/data-plane-adoption

fultonj · 2026-02-12T13:57:40Z

Add a new scenario that deploys 3 Ceph clusters across DCN sites:

Central: 3 ComputeHCI nodes with Ceph
DCN1: 3 ComputeHCIDcn1 nodes with Ceph, Cinder, Glance
DCN2: 3 ComputeHCIDcn2 nodes with Ceph, Cinder, Glance

Key Ceph changes:

New dcn_storage.yaml scenario with pre_oc_run hooks to deploy Ceph via adoption_deploy_ceph.yml for each stack
HCI compute roles include CephOSD service and StorageMgmt network
Update ceph_backend_configuration role to handle >1 ceph cluster
Document adoption for multiple ceph clusters

Key Glance changes:

Update role stop_openstack_services to stop glance at DCN sites
Update role glance_adoption to adopt multibackend glance
Document adoption of DCN multibackend Glance

Key Cinder changes:

Update role stop_openstack_services to stop cinder-volume and etcd at DCN sites
Update role cinder_adoption to add cinder_volume_backend: dcn
Adopt cinder-backup
Document adoption of DCN mulisite Cinder

Key Manila changes:

Add manila_cephfs_conf_path and manila_cephfs_cluster_name variables to manila_adoption role, replacing hardcoded ceph.conf/ceph values.
Override those variables to central in vars.dcn_storage.yaml
Updated proc_deploying-file-systems-service-control-plane.adoc with a NOTE that Manila was central-only in TripleO DCN but can be deployed at edge sites in RHOSO, and bullet explaining the cluster-specific conf path

Key EDPM changes:

Update data-plane-adoption role to handle many nodesets each containing differnt ceph and glance configurations
Update proc_adopting-compute-services-to-the-data-plane.adoc to document how to adopt DCN compute nodes which ran storage services so that they access the APIs for those storage services on central OpenShift

This extends dcn_nostorage to support storage adoption with independent Ceph clusters at each DCN site.

fultonj · 2026-02-12T14:10:12Z

todo:

switch to >1 cephx key secret

fmount

Thanks @fultonj for starting this.
I did a first patch of this patch (sorry for being so late). Overall I think it covers very well the DCN adoption scenario with Ceph.
I left some (non-blocking) comments but looks like this is going to the right direction!

fultonj · 2026-02-23T14:31:24Z

todo:

switch to >1 cephx key secret

Done with latest patch set.

multiple_k8s_cephx_secrets.diff.txt

softwarefactory-project-zuul · 2026-02-23T14:34:57Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/5cd792d38f3a4148a157f6545331a0e6

✔️ noop SUCCESS in 0s
❌ adoption-standalone-to-crc-ceph NODE_FAILURE Node request 100-0008169736 failed in 0s
❌ adoption-standalone-to-crc-no-ceph NODE_FAILURE Node request 100-0008169737 failed in 0s
✔️ adoption-docs-preview SUCCESS in 2m 08s

softwarefactory-project-zuul · 2026-02-24T20:47:47Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/9daf8de49c9c416cbee60acf8f19e47d

✔️ noop SUCCESS in 0s
❌ adoption-standalone-to-crc-ceph RETRY_LIMIT in 11m 45s
❌ adoption-standalone-to-crc-no-ceph RETRY_LIMIT in 12m 11s
✔️ adoption-docs-preview SUCCESS in 1m 33s

fmount

Overall the patch looks good and I suggest to have someone from the adoption team (e.g. @jistr) to review it and see if we can move forward.
The content looks good and aligns with the core design principles of the adoption process.
I only have 1 nit and a question on the glance_adoption/defaults/main.yaml.
Looks good to me otherwise.

fmount · 2026-02-26T11:14:30Z

/lgtm

softwarefactory-project-zuul · 2026-03-02T22:34:07Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/149c3e5f89e94ea795f1b2d5d5c6629b

✔️ noop SUCCESS in 0s
❌ adoption-standalone-to-crc-ceph FAILURE in 2h 01m 28s
❌ adoption-standalone-to-crc-no-ceph FAILURE in 2h 05m 36s
✔️ adoption-docs-preview SUCCESS in 1m 34s

rheslop · 2026-03-03T14:01:38Z

/lgtm

openshift-ci · 2026-03-03T14:01:41Z

@rheslop: changing LGTM is restricted to collaborators

Details

In response to this:

/lgtm

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

fultonj · 2026-03-03T14:11:27Z

I have two very minor edits. After you incorporate those, and if @rheslop doesn't have further edits, I'll add the appropriate labels to trigger the merge.

@klgill Roger approved the changes and I believe your changes have been incorporated. If you're satisfied with them would you please remove your request for changes in the review?

I think we should wait for @jistr to review before merging since there's also a lot of code changes here but knowing the adoc file updates have passed your review is an important next step. Thanks!

klgill

/lgtm

Add a new scenario that deploys 3 Ceph clusters across DCN sites: - Central: 3 ComputeHCI nodes with Ceph - DCN1: 3 ComputeHCIDcn1 nodes with Ceph, Cinder, Glance - DCN2: 3 ComputeHCIDcn2 nodes with Ceph, Cinder, Glance Key Ceph changes: - New dcn_storage.yaml scenario with pre_oc_run hooks to deploy Ceph via adoption_deploy_ceph.yml for each stack - HCI compute roles include CephOSD service and StorageMgmt network - Update ceph_backend_configuration role to handle >1 ceph cluster - Document adoption for multiple ceph clusters Key Glance changes: - Update role stop_openstack_services to stop glance at DCN sites - Update role glance_adoption to adopt multibackend glance - Document adoption of DCN multibackend Glance Key Cinder changes: - Update role stop_openstack_services to stop cinder-volume and etcd at DCN sites - Update role cinder_adoption to add cinder_volume_backend: dcn - Adopt cinder-backup - Document adoption of DCN multisite Cinder Key Manila changes: - Add manila_cephfs_conf_path and manila_cephfs_cluster_name variables to manila_adoption role, replacing hardcoded ceph.conf/ceph values. - Override those variables to central in vars.dcn_storage.yaml - Updated proc_deploying-file-systems-service-control-plane.adoc with a NOTE that Manila was central-only in TripleO DCN but can be deployed at edge sites in RHOSO, and bullet explaining the cluster-specific conf path Key EDPM changes: - Update data-plane-adoption role to handle many nodesets each containing differnt ceph and glance configurations - Update proc_adopting-compute-services-to-the-data-plane.adoc to document how to adopt DCN compute nodes which ran storage services so that they access the APIs for those storage services on central OpenShift This extends dcn_nostorage to support storage adoption with independent Ceph clusters at each DCN site. Co-Authored-By: Claude <noreply@anthropic.com> Signed-off-by: John Fulton <fulton@redhat.com>

softwarefactory-project-zuul · 2026-03-03T21:10:30Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/fce38c3f0a06424384540309dc10bdf8

✔️ noop SUCCESS in 0s
✔️ adoption-standalone-to-crc-ceph SUCCESS in 3h 03m 51s
❌ adoption-standalone-to-crc-no-ceph FAILURE in 2h 08m 32s
✔️ adoption-docs-preview SUCCESS in 1m 23s

jistr

/lgtm

fultonj · 2026-03-04T11:57:50Z

Green: adoption-standalone-to-crc-ceph
Red: adoption-standalone-to-crc-no-ceph

The redness is caused by wait for Barbican to start up. which I do not think is related to this patch so I'll check again

fultonj · 2026-03-04T12:02:04Z

recheck

fultonj · 2026-03-04T12:29:37Z

Looks like last green run of adoption-standalone-to-crc-no-ceph was 2026-02-26 19:46:24

fultonj · 2026-03-09T15:37:10Z

adoption-standalone-to-crc-no-ceph was green today

fultonj · 2026-03-09T15:37:16Z

recheck

jistr · 2026-03-10T14:01:29Z

/approve

openshift-ci · 2026-03-10T14:01:35Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jistr

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [jistr]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

klgill · 2026-03-16T14:59:24Z

/cherry-pick 18.0-fr5

openshift-cherrypick-robot · 2026-03-16T15:00:05Z

@klgill: #1245 failed to apply on top of branch "18.0-fr5":

Applying: Add dcn_storage scenario for DCN adoption with Ceph HCI
Using index info to reconstruct a base tree...
M	docs_user/assemblies/assembly_adopting-openstack-control-plane-services.adoc
M	docs_user/assemblies/assembly_adopting-the-data-plane.adoc
M	docs_user/assemblies/assembly_adopting-the-image-service.adoc
M	docs_user/modules/con_adoption-limitations.adoc
M	docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc
M	tests/roles/dataplane_adoption/defaults/main.yaml
Falling back to patching base and 3-way merge...
Auto-merging tests/roles/dataplane_adoption/defaults/main.yaml
CONFLICT (add/add): Merge conflict in docs_user/modules/proc_adopting-image-service-with-dcn-backend.adoc
Auto-merging docs_user/modules/proc_adopting-image-service-with-dcn-backend.adoc
CONFLICT (add/add): Merge conflict in docs_user/modules/proc_adopting-compute-services-with-dcn-backend.adoc
Auto-merging docs_user/modules/proc_adopting-compute-services-with-dcn-backend.adoc
Auto-merging docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc
CONFLICT (add/add): Merge conflict in docs_user/modules/proc_adopting-block-storage-service-with-dcn-backend.adoc
Auto-merging docs_user/modules/proc_adopting-block-storage-service-with-dcn-backend.adoc
Auto-merging docs_user/modules/con_adoption-limitations.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Add dcn_storage scenario for DCN adoption with Ceph HCI

Details

In response to this:

/cherry-pick 18.0-fr5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

fultonj added the do-not-merge/work-in-progress label Feb 12, 2026

fultonj marked this pull request as draft February 12, 2026 13:59

fultonj requested a review from fmount February 12, 2026 14:00

fmount reviewed Feb 12, 2026

View reviewed changes

fultonj mentioned this pull request Feb 18, 2026

[adoption_osp_deploy] Add dcn_storage scenario for DCN adoption with Ceph HCI openstack-k8s-operators/ci-framework#3697

Merged

fultonj force-pushed the dcn_adoption_hci branch 8 times, most recently from 0404f2c to 4f930a7 Compare February 23, 2026 14:31

fultonj force-pushed the dcn_adoption_hci branch 2 times, most recently from c97dd05 to a6c5ee7 Compare February 23, 2026 20:37

fultonj mentioned this pull request Feb 23, 2026

edited Ceph DCN files #1263

Closed

fultonj force-pushed the dcn_adoption_hci branch 3 times, most recently from ee8ceb0 to e33ba02 Compare February 23, 2026 23:16

fultonj removed the do-not-merge/work-in-progress label Feb 24, 2026

fultonj marked this pull request as ready for review February 24, 2026 14:59

fultonj force-pushed the dcn_adoption_hci branch from e33ba02 to 4ba4778 Compare February 24, 2026 20:34

fmount reviewed Feb 26, 2026

View reviewed changes

Comment thread tests/roles/glance_adoption/tasks/main.yaml

Comment thread tests/roles/dataplane_adoption/tasks/main.yaml Outdated

Comment thread tests/roles/glance_adoption/defaults/main.yaml Outdated

Comment thread tests/roles/cinder_adoption/defaults/main.yaml

fultonj force-pushed the dcn_adoption_hci branch 2 times, most recently from ffa3597 to 72d3436 Compare February 26, 2026 11:14

fultonj requested a review from klgill March 2, 2026 21:40

klgill approved these changes Mar 3, 2026

View reviewed changes

openshift-ci Bot assigned klgill Mar 3, 2026

openshift-ci Bot added the lgtm label Mar 3, 2026

jistr reviewed Mar 3, 2026

View reviewed changes

Comment thread tests/roles/cinder_adoption/templates/cinder_dcn.yaml.j2 Outdated

fultonj force-pushed the dcn_adoption_hci branch from bc9f2c9 to e4c2bf5 Compare March 3, 2026 17:23

openshift-ci Bot removed the lgtm label Mar 3, 2026

fultonj force-pushed the dcn_adoption_hci branch from e4c2bf5 to 44d6c84 Compare March 3, 2026 17:53

fultonj force-pushed the dcn_adoption_hci branch from 44d6c84 to 24373c9 Compare March 3, 2026 18:05

jistr approved these changes Mar 4, 2026

View reviewed changes

openshift-ci Bot assigned jistr Mar 4, 2026

openshift-ci Bot added the lgtm label Mar 4, 2026

openshift-ci Bot added the approved label Mar 10, 2026

openshift-merge-bot Bot merged commit 68e4474 into openstack-k8s-operators:main Mar 10, 2026
6 checks passed

klgill mentioned this pull request Mar 16, 2026

manual cherry-pick of DCN storage files to FR5 #1317

Merged

Uh oh!

Conversation

fultonj commented Feb 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fultonj commented Feb 12, 2026

Uh oh!

fmount left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

fultonj commented Feb 23, 2026

Uh oh!

softwarefactory-project-zuul Bot commented Feb 23, 2026

Uh oh!

softwarefactory-project-zuul Bot commented Feb 24, 2026

Uh oh!

fmount left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

fmount commented Feb 26, 2026

Uh oh!

softwarefactory-project-zuul Bot commented Mar 2, 2026

Uh oh!

rheslop commented Mar 3, 2026

Uh oh!

openshift-ci Bot commented Mar 3, 2026

Uh oh!

fultonj commented Mar 3, 2026

Uh oh!

klgill left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

softwarefactory-project-zuul Bot commented Mar 3, 2026

Uh oh!

jistr left a comment

Choose a reason for hiding this comment

Uh oh!

fultonj commented Mar 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fultonj commented Mar 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fultonj commented Mar 4, 2026

Uh oh!

fultonj commented Mar 9, 2026

Uh oh!

fultonj commented Mar 9, 2026

Uh oh!

jistr commented Mar 10, 2026

Uh oh!

openshift-ci Bot commented Mar 10, 2026

Uh oh!

Uh oh!

klgill commented Mar 16, 2026

Uh oh!

openshift-cherrypick-robot commented Mar 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

fultonj commented Feb 12, 2026 •

edited

Loading

fultonj commented Mar 4, 2026 •

edited

Loading

fultonj commented Mar 4, 2026 •

edited

Loading